From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 17 Oct 2019 12:56:27 +0000 (-0500)
Subject: icon theme: Avoid a string copy
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~321^2^2~696^2~11
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=233d096261f0ed133ff9918b8e63982d7f14a1da;p=gtk4.git

icon theme: Avoid a string copy

This is in an error path, so mostly cosmetic.
---

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index ee7f7c49bb..cbb462c029 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3454,19 +3454,18 @@ icon_info_ensure_scale_and_texture (GtkIconInfo *icon_info)
 
       if (warn_about_load_failure)
         {
-          gchar *path;
+          const char *path;
 
-          if (icon_info->is_resource)
-            path = g_strdup (icon_info->filename);
+          if (icon_info->filename)
+            path = icon_info->filename;
           else if (G_IS_FILE (icon_info->loadable))
-            path = g_file_get_path (G_FILE (icon_info->loadable));
+            path = g_file_peek_path (G_FILE (icon_info->loadable));
           else
-            path = g_strdup ("icon theme");
+            path = "icon theme";
 
           g_warning ("Could not load a pixbuf from %s.\n"
                      "This may indicate that pixbuf loaders or the mime database could not be found.",
                      path);
-          g_free (path);
 
           warn_about_load_failure = FALSE;
         }